From 78b04c6c847e649f7eb4d4c47abbe99394785905 Mon Sep 17 00:00:00 2001 From: "emellor@ewan" Date: Fri, 23 Sep 2005 16:53:57 +0100 Subject: [PATCH] Neaten the configuration parsing code. Add a self parameter to configureBootloading. Signed-off-by: Ewan Mellor --- tools/python/xen/xend/image.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py index c1609b2caa..35c4700fd5 100644 --- a/tools/python/xen/xend/image.py +++ b/tools/python/xen/xend/image.py @@ -111,18 +111,21 @@ class ImageHandler: def configure(self, imageConfig, _): """Config actions common to all unix-like domains.""" - self.kernel = sxp.child_value(imageConfig, "kernel") + def get_cfg(name, default = None): + return sxp.child_value(imageConfig, name, default) + + self.kernel = get_cfg("kernel") self.cmdline = "" - ip = sxp.child_value(imageConfig, "ip", None) + ip = get_cfg("ip") if ip: self.cmdline += " ip=" + ip - root = sxp.child_value(imageConfig, "root") + root = get_cfg("root") if root: self.cmdline += " root=" + root - args = sxp.child_value(imageConfig, "args") + args = get_cfg("args") if args: self.cmdline += " " + args - self.ramdisk = sxp.child_value(imageConfig, "ramdisk", '') + self.ramdisk = get_cfg("ramdisk", '') self.vm.storeVm(("image/ostype", self.ostype), ("image/kernel", self.kernel), @@ -130,7 +133,7 @@ class ImageHandler: ("image/ramdisk", self.ramdisk)) - def handleBootloading(): + def handleBootloading(self): self.unlink(self.kernel) self.unlink(self.ramdisk) -- 2.30.2